From 1924ae2a94812e57d52995c6a6892a257d1446f0 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Fri, 9 Jan 2009 04:23:38 +0000 Subject: [PATCH] Replace last-command-char with last-command-event. --- lisp/ChangeLog | 1 + lisp/eshell/em-smart.el | 2 +- lisp/eshell/esh-mode.el | 10 +++++----- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 2e321a6d71a..107ea86e2db 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -7,6 +7,7 @@ * calc/calc-keypd.el, calc/calc-misc.el, calc/calc-prog.el: * calc/calc-sel.el, calc/calc-store.el, calc/calc-stuff.el: * calc/calc-units.el, calc/calc-yank.el, calc/calc.el: + * eshell/em-smart.el, eshell/esh-mode.el: * play/mpuz.el: * progmodes/ada-mode.el, progmodes/antlr-mode.el, progmodes/cc-align.el: * progmodes/cc-cmds.el, progmodes/cperl-mode.el, progmodes/f90.el: diff --git a/lisp/eshell/em-smart.el b/lisp/eshell/em-smart.el index 1396cce33fe..43de7ff760c 100644 --- a/lisp/eshell/em-smart.el +++ b/lisp/eshell/em-smart.el @@ -291,7 +291,7 @@ and the end of the buffer are still visible." (setq clear t) (cond ((eq this-command 'self-insert-command) - (if (eq last-command-char ? ) + (if (eq last-command-event ? ) (if (and eshell-smart-space-goes-to-end eshell-current-command) (if (not (pos-visible-in-window-p (point-max))) diff --git a/lisp/eshell/esh-mode.el b/lisp/eshell/esh-mode.el index a929916f232..9cd7c1b0477 100644 --- a/lisp/eshell/esh-mode.el +++ b/lisp/eshell/esh-mode.el @@ -1,7 +1,7 @@ ;;; esh-mode.el --- user interface -;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, -;; 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, +;; 2008, 2009 Free Software Foundation, Inc. ;; Author: John Wiegley @@ -484,9 +484,9 @@ This is used by `eshell-watch-for-password-prompt'." (interactive "i") (process-send-string (eshell-interactive-process) - (char-to-string (if (symbolp last-command-char) - (get last-command-char 'ascii-character) - last-command-char)))) + (char-to-string (if (symbolp last-command-event) + (get last-command-event 'ascii-character) + last-command-event)))) (defun eshell-intercept-commands () (when (and (eshell-interactive-process) -- 2.30.2